//
//  ViewController.m
//  texs
//
//  Created by 王培铮 on 2018/4/9.
//  Copyright © 2018年 nuanshui. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
    
    
    
    //在dev上疯狂开发
    //dev上提交2.0
    
    
    
    
    //1.0提交

    //2.0开发

    
    //又搞了一个分支   修改1.0BUG
    //1.0BUG 验收通过

}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}


@end
